From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Tue, 7 Aug 2012 15:38:12 +0000 (+0200)
Subject: UnlockDialog: Move "Login as another user" at the bottom
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~6212
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=03db0d630ed5322f3638c4af725f1d0d06260ef3;p=gnome-shell.git

UnlockDialog: Move "Login as another user" at the bottom

The Unlock button is more logically related to the entry than
this link, and having the latter in the middle breaks the workflow.

https://bugzilla.gnome.org/show_bug.cgi?id=681143
---

diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 76c50ef69..22e5e628c 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -2092,6 +2092,7 @@ StButton.popup-menu-item:insensitive {
     font-size: 10.5pt;
     font-weight: bold;
     color: #666666;
+    padding-top: 1em;
 }
 
 .login-dialog-not-listed-button:hover .login-dialog-not-listed-label {
diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js
index 5cbe2e527..e1291886c 100644
--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@@ -126,6 +126,15 @@ const UnlockDialog = new Lang.Class({
         this._promptFingerprintMessage.hide();
         this.contentLayout.add_actor(this._promptFingerprintMessage);
 
+        this._okButton = { label: _("Unlock"),
+                           action: Lang.bind(this, this._doUnlock),
+                           default: true };
+        this.setButtons([this._okButton]);
+        this.setActionKey(Clutter.KEY_Escape, Lang.bind(this, this._escape));
+
+        this._updateOkButton(false);
+        this._reset();
+
         let otherUserLabel = new St.Label({ text: _("Login as another user"),
                                             style_class: 'login-dialog-not-listed-label' });
         this._otherUserButton = new St.Button({ style_class: 'login-dialog-not-listed-button',
@@ -135,18 +144,9 @@ const UnlockDialog = new Lang.Class({
                                                 x_align: St.Align.START,
                                                 x_fill: true });
         this._otherUserButton.connect('clicked', Lang.bind(this, this._otherUserClicked));
-        this.contentLayout.add(this._otherUserButton,
-                               { x_align: St.Align.START,
-                                 x_fill: false });
-
-        this._okButton = { label: _("Unlock"),
-                           action: Lang.bind(this, this._doUnlock),
-                           default: true };
-        this.setButtons([this._okButton]);
-        this.setActionKey(Clutter.KEY_Escape, Lang.bind(this, this._escape));
-
-        this._updateOkButton(false);
-        this._reset();
+        this.dialogLayout.add(this._otherUserButton,
+                              { x_align: St.Align.START,
+                                x_fill: false });
 
         GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
             this.emit('loaded');